1 files changed, 16 insertions, 5 deletions

diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc
index d233a07..1a21c02 100644
--- a/src/eyefiservice.cc
+++ b/src/eyefiservice.cc
@@ -3,16 +3,19 @@
 #include <fstream>
 #include <stdexcept>
 #include <iterator>
 #include <syslog.h>
 #include <sys/wait.h>
 #include <autosprintf.h>
+#include <openssl/rand.h>
 #include "eyekinfig.h"
 #include "eyetil.h"
 #include "soapeyefiService.h"
 
+static binary_t session_nonce;
+
 static bool detached_child() {
     pid_t p = fork();
     if(p<0) throw std::runtime_error("failed to fork()");
     if(!p) {
         p = fork();
         if(p<0) {
@@ -43,15 +46,14 @@ int eyefiService::StartSession(
 #ifndef NDEBUG
     syslog(LOG_DEBUG,
             "StartSession request from %s with cnonce=%s, transfermode=%d, transfermodetimestamp=%ld",
             macaddress.c_str(), cnonce.c_str(), transfermode, transfermodetimestamp );
 #endif
     r.credential = binary_t(macaddress+cnonce+eyekinfig_t(macaddress).get_upload_key()).md5().hex();
-    /* TODO: better nonce generator */
-    time_t t = time(0);
-    r.snonce = binary_t(&t,sizeof(t)).md5().hex();
+
+    r.snonce = session_nonce.make_nonce().hex();
     r.transfermode=transfermode;
     r.transfermodetimestamp=transfermodetimestamp;
     r.upsyncallowed=false;
 
     std::string cmd = eyekinfig_t(macaddress).get_on_start_session();
     if(!cmd.empty()) {
@@ -71,15 +73,24 @@ int eyefiService::StartSession(
 int eyefiService::GetPhotoStatus(
         std::string credential, std::string macaddress,
         std::string filename, long filesize, std::string filesignature,
         struct rns__GetPhotoStatusResponse &r ) {
 #ifndef NDEBUG
     syslog(LOG_DEBUG,
-            "GetPhotoStatus request from %s with credential=%s, filename=%s, filesize=%ld, filesignature=%s",
-            macaddress.c_str(), credential.c_str(), filename.c_str(), filesize, filesignature.c_str() );
+            "GetPhotoStatus request from %s with credential=%s, filename=%s, filesize=%ld, filesignature=%s; session nonce=%s",
+            macaddress.c_str(), credential.c_str(), filename.c_str(), filesize, filesignature.c_str(), session_nonce.hex().c_str() );
+#endif
+
+    std::string computed_credential = binary_t(macaddress+eyekinfig_t(macaddress).get_upload_key()+session_nonce.hex()).md5().hex();
+
+#ifndef NDEBUG
+    syslog(LOG_DEBUG, " computed credential=%s", computed_credential.c_str());
 #endif
+
+    if (credential != computed_credential) throw std::runtime_error("card authentication failed");
+
     r.fileid = 1; r.offset = 0;
     return SOAP_OK;
 }
 
 int eyefiService::MarkLastPhotoInRoll(
         std::string macaddress, int mergedelta,