add back SRP. i was being too greedy.

1 files changed, 33 insertions, 0 deletions

diff --git a/src/lib/libssl/ssl_asn1.c b/src/lib/libssl/ssl_asn1.c
index b1a3876c91..28e295f6a4 100644
--- a/src/lib/libssl/ssl_asn1.c
+++ b/src/lib/libssl/ssl_asn1.c
@@ -113,6 +113,9 @@ typedef struct ssl_session_asn1_st {
         ASN1_OCTET_STRING psk_identity_hint;
         ASN1_OCTET_STRING psk_identity;
 #endif /* OPENSSL_NO_PSK */
+#ifndef OPENSSL_NO_SRP
+        ASN1_OCTET_STRING srp_username;
+#endif /* OPENSSL_NO_SRP */
 } SSL_SESSION_ASN1;
 
 int
@@ -130,6 +133,9 @@ i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
         unsigned char cbuf;
         int v11 = 0;
 #endif
+#ifndef OPENSSL_NO_SRP
+        int v12 = 0;
+#endif
         long l;
         SSL_SESSION_ASN1 a;
         M_ASN1_I2D_vars(in);
@@ -247,6 +253,13 @@ i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
                 a.psk_identity.data = (unsigned char *)(in->psk_identity);
         }
 #endif /* OPENSSL_NO_PSK */
+#ifndef OPENSSL_NO_SRP
+        if (in->srp_username) {
+                a.srp_username.length = strlen(in->srp_username);
+                a.srp_username.type = V_ASN1_OCTET_STRING;
+                a.srp_username.data = (unsigned char *)(in->srp_username);
+        }
+#endif /* OPENSSL_NO_SRP */
 
         M_ASN1_I2D_len(&(a.version),            i2d_ASN1_INTEGER);
         M_ASN1_I2D_len(&(a.ssl_version),        i2d_ASN1_INTEGER);
@@ -287,6 +300,10 @@ i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
         if (in->psk_identity)
                 M_ASN1_I2D_len_EXP_opt(&(a.psk_identity), i2d_ASN1_OCTET_STRING, 8, v8);
 #endif /* OPENSSL_NO_PSK */
+#ifndef OPENSSL_NO_SRP
+        if (in->srp_username)
+                M_ASN1_I2D_len_EXP_opt(&(a.srp_username), i2d_ASN1_OCTET_STRING, 12, v12);
+#endif /* OPENSSL_NO_SRP */
 
         M_ASN1_I2D_seq_total();
 
@@ -331,6 +348,10 @@ i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
         if (in->compress_meth)
                 M_ASN1_I2D_put_EXP_opt(&(a.comp_id), i2d_ASN1_OCTET_STRING, 11, v11);
 #endif
+#ifndef OPENSSL_NO_SRP
+        if (in->srp_username)
+                M_ASN1_I2D_put_EXP_opt(&(a.srp_username), i2d_ASN1_OCTET_STRING, 12, v12);
+#endif /* OPENSSL_NO_SRP */
         M_ASN1_I2D_finish();
 }
 
@@ -559,6 +580,18 @@ long length)
         }
 #endif
 
+#ifndef OPENSSL_NO_SRP
+        os.length = 0;
+        os.data = NULL;
+        M_ASN1_D2I_get_EXP_opt(osp, d2i_ASN1_OCTET_STRING, 12);
+        if (os.data) {
+                ret->srp_username = BUF_strndup((char *)os.data, os.length);
+                OPENSSL_free(os.data);
+                os.data = NULL;
+                os.length = 0;
+        } else
+                ret->srp_username = NULL;
+#endif /* OPENSSL_NO_SRP */
 
         M_ASN1_D2I_Finish(a, SSL_SESSION_free, SSL_F_D2I_SSL_SESSION);
 }